Add sync-with-base-branch step to /ship to prevent merge conflicts#23
Merged
Conversation
Member
Author
Review SummaryVerdict: APPROVE Findings
No issues found. Code looks correct and follows project conventions. |
Merged
sebastientaggart
added a commit
that referenced
this pull request
Apr 8, 2026
Add sync-with-base-branch step to /ship to prevent merge conflicts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a new Step 4 (Sync with base branch) to the /ship skill that runs
git fetch origin <base> && git merge origin/<base>before committing. This ensures the feature branch is up to date with dev (or main in trunk mode) before any commit is made, preventing the merge conflicts that occur when sequential feature branches carry stale generated files.Uses merge (not rebase) so it's safe for all cases: unpushed branches fast-forward, pushed branches get a clean merge commit without force push.
Issue #22